From: Platonides <platonides@users.mediawiki.org>
Date: Wed, 15 Jun 2011 21:22:08 +0000 (+0000)
Subject: r87164 removed mDataLoaded and broke this test databaseless nature.
X-Git-Tag: 1.31.0-rc.0~29509
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=7035bb4034db4aa04804072e70533289361f7a6d;p=lhc%2Fweb%2Fwiklou.git

r87164 removed mDataLoaded and broke this test databaseless nature.
---

diff --git a/tests/phpunit/includes/LanguageConverterTest.php b/tests/phpunit/includes/LanguageConverterTest.php
index d084540c9c..74a5a5ee3a 100644
--- a/tests/phpunit/includes/LanguageConverterTest.php
+++ b/tests/phpunit/includes/LanguageConverterTest.php
@@ -1,6 +1,5 @@
 <?php
 
-
 class LanguageConverterTest extends MediaWikiLangTestCase {
 	protected $lang = null;
 	protected $lc = null;
@@ -19,11 +18,11 @@ class LanguageConverterTest extends MediaWikiLangTestCase {
 	}
 
 	function tearDown() {
-		global $wgMemc, $wgContLang;
+		global $wgMemc;
 		unset( $wgMemc );
 		unset( $this->lc );
 		unset( $this->lang );
-		$wgContLang = Language::factory( 'en' );
+		parent::tearDown();
 	}
 
 	function testGetPreferredVariantDefaults() {
@@ -63,6 +62,7 @@ class LanguageConverterTest extends MediaWikiLangTestCase {
 
 		$wgUser = new User;
 		$wgUser->setId( 1 );
+		$wgUser->mFrom = 'defaults';
 		$wgUser->mDataLoaded = true;
 		$wgUser->mOptionsLoaded = true;
 		$wgUser->setOption( 'variant', 'tg-latn' );
@@ -77,7 +77,7 @@ class LanguageConverterTest extends MediaWikiLangTestCase {
 		$wgRequest->setVal( 'variant', 'tg' );
 		$wgUser = User::newFromId( "admin" );
 		$wgUser->setId( 1 );
-		$wgUser->mDataLoaded = true;
+		$wgUser->mFrom = 'defaults';
 		$wgUser->mOptionsLoaded = true;
 		$wgUser->setOption( 'variant', 'tg-latn' ); // The user's data is ignored
 												  // because the variant is set in the URL.